Skip to content

USHIFT-737: Fix user workload greenboot verification to check for 1 pod#1480

Merged
openshift-merge-robot merged 1 commit into
openshift:mainfrom
ggiguash:user_greenboot_fix
Mar 9, 2023
Merged

USHIFT-737: Fix user workload greenboot verification to check for 1 pod#1480
openshift-merge-robot merged 1 commit into
openshift:mainfrom
ggiguash:user_greenboot_fix

Conversation

@ggiguash

@ggiguash ggiguash commented Mar 9, 2023 •
edited by openshift-ci Bot
Loading

Copy link
Copy Markdown
Contributor

Closes USHIFT-737

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 9, 2023
@openshift-ci-robot

openshift-ci-robot commented Mar 9, 2023 •
edited by openshift-ci Bot
Loading

Copy link
Copy Markdown

@ggiguash: This pull request references USHIFT-737 which is a valid jira issue.

Details

In response to this:

Closes USHIFT-737

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

1 similar comment
@openshift-ci-robot

openshift-ci-robot commented Mar 9, 2023 •
edited by openshift-ci Bot
Loading

Copy link
Copy Markdown

@ggiguash: This pull request references USHIFT-737 which is a valid jira issue.

Details

In response to this:

Closes USHIFT-737

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci openshift-ci Bot requested review from pmtk and stlaz March 9, 2023 17:36
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 9, 2023
@pmtk

pmtk commented Mar 9, 2023

Copy link
Copy Markdown
Member

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 9, 2023
@openshift-ci

openshift-ci Bot commented Mar 9, 2023

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ggiguash, pmtk

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ggiguash

ggiguash commented Mar 9, 2023

Copy link
Copy Markdown
Contributor Author

/cherrypick release-4.13

@openshift-cherrypick-robot

openshift-cherrypick-robot commented Mar 9, 2023

Copy link
Copy Markdown

@ggiguash: once the present PR merges, I will cherry-pick it on top of release-4.13 in a new PR and assign it to you.

Details

In response to this:

/cherrypick release-4.13

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci

openshift-ci Bot commented Mar 9, 2023

Copy link
Copy Markdown
Contributor

@ggiguash: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit f609b07 into openshift:main Mar 9, 2023
@openshift-cherrypick-robot

openshift-cherrypick-robot commented Mar 9, 2023

Copy link
Copy Markdown

@ggiguash: #1480 failed to apply on top of branch "release-4.13":

Applying: Fix user workload greenboot verification to check for 1 pod
Using index info to reconstruct a base tree...
A	docs/config/busybox_running_check.sh
M	docs/greenboot_dev.md
Falling back to patching base and 3-way merge...
Auto-merging docs/greenboot_dev.md
CONFLICT (content): Merge conflict in docs/greenboot_dev.md
CONFLICT (modify/delete): docs/config/busybox_running_check.sh deleted in HEAD and modified in Fix user workload greenboot verification to check for 1 pod. Version Fix user workload greenboot verification to check for 1 pod of docs/config/busybox_running_check.sh left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix user workload greenboot verification to check for 1 pod
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherrypick release-4.13

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ggiguash

ggiguash commented Mar 13, 2023

Copy link
Copy Markdown
Contributor Author

/cherrypick release-4.13

@openshift-cherrypick-robot

openshift-cherrypick-robot commented Mar 13, 2023

Copy link
Copy Markdown

@ggiguash: #1480 failed to apply on top of branch "release-4.13":

Applying: Fix user workload greenboot verification to check for 1 pod
Using index info to reconstruct a base tree...
A	docs/config/busybox_running_check.sh
M	docs/greenboot_dev.md
Falling back to patching base and 3-way merge...
Auto-merging docs/greenboot_dev.md
CONFLICT (content): Merge conflict in docs/greenboot_dev.md
CONFLICT (modify/delete): docs/config/busybox_running_check.sh deleted in HEAD and modified in Fix user workload greenboot verification to check for 1 pod. Version Fix user workload greenboot verification to check for 1 pod of docs/config/busybox_running_check.sh left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix user workload greenboot verification to check for 1 pod
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherrypick release-4.13

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ggiguash ggiguash deleted the user_greenboot_fix branch March 13, 2023 13:16
@ggiguash

ggiguash commented Mar 13, 2023

Copy link
Copy Markdown
Contributor Author

/cherrypick release-4.13

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Mar 13, 2023
Merged
@openshift-cherrypick-robot

openshift-cherrypick-robot commented Mar 13, 2023

Copy link
Copy Markdown

@ggiguash: new pull request created: #1495

Details

In response to this:

/cherrypick release-4.13

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pmtk pmtk Awaiting requested review from pmtk

@stlaz stlaz Awaiting requested review from stlaz

Assignees

@pmtk pmtk

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ggiguash @openshift-ci-robot @pmtk @openshift-cherrypick-robot @openshift-merge-robot